auto merge of #989 : jbcrail/cargo/fix-doc-spelling, r=steveklabnik

author bors <bors@rust-lang.org>

Mon, 8 Dec 2014 19:36:21 +0000 (19:36 +0000)

committer bors <bors@rust-lang.org>

Mon, 8 Dec 2014 19:36:21 +0000 (19:36 +0000)
author bors <bors@rust-lang.org>
Mon, 8 Dec 2014 19:36:21 +0000 (19:36 +0000)
committer bors <bors@rust-lang.org>
Mon, 8 Dec 2014 19:36:21 +0000 (19:36 +0000)
diff --cc src/doc/build-script.md
Simple merge
diff --cc src/doc/guide.md
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 8 Dec 2014 19:36:21 +0000 (19:36 +0000)
committer	bors <bors@rust-lang.org>
	Mon, 8 Dec 2014 19:36:21 +0000 (19:36 +0000)
		1	2
src/doc/build-script.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/doc/guide.md	patch \|	diff1 \|	diff2 \|	blob \| history